Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Mon, 14 Jun 2010 11:56:46 +0000 (11:56 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Mon, 14 Jun 2010 11:56:46 +0000 (11:56 +0000)

Trivial merge